fixing code with extension methods